[tools] Set guest address size to be the same as dom0 address size on restore.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>

diff --git a/tools/libxc/xc_linux_restore.c b/tools/libxc/xc_linux_restore.c
index 1c7ab23f75604751cfd52d9282e9ff8f5bd8d185..9a8152bebc219f39de97ce319ca89335209920ca 100644 (file)
--- a/tools/libxc/xc_linux_restore.c
+++ b/tools/libxc/xc_linux_restore.c
@@ -192,6 +192,19 @@ int xc_linux_restore(int xc_handle, int io_fd,
 
     DPRINTF("xc_linux_restore start: max_pfn = %lx\n", max_pfn);
 
+    /*
+     * XXX For now, 32bit dom0's can only save/restore 32bit domUs
+     * on 64bit hypervisors.
+     */
+    memset(&domctl, 0, sizeof(domctl));
+    domctl.domain = dom;
+    domctl.cmd    = XEN_DOMCTL_set_address_size;
+    domctl.u.address_size.size = sizeof(unsigned long) * 8;
+    rc = do_domctl(xc_handle, &domctl);
+    if ( rc != 0 ) {
+       ERROR("Unable to set guest address size.");
+       goto out;
+    }
 
     if(!get_platform_info(xc_handle, dom,
                           &max_mfn, &hvirt_start, &pt_levels)) {